Joel-Lassess-MacBook-Pro:fargtorget jlasses$ git status# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 36 different commit(s) each, respectively.
#
# Changes to be committed:
#
#	modified:   deploydm.sh
#	modified:   pom.xml
#	modified:   src/main/java/se/fargtorget/model/Color.java
#	modified:   src/main/java/se/fargtorget/repository/CouchDbColorRepository.java
#	modified:   src/main/java/se/fargtorget/web/controller/PaintProductPageController.java
#	modified:   src/main/webapp/WEB-INF/decorator/header.jsp
#	modified:   src/main/webapp/WEB-INF/decorator/leftnav.jsp
#	modified:   src/main/webapp/WEB-INF/decorator/main.jsp
#	modified:   src/main/webapp/WEB-INF/decorator/top.jsp
#	deleted:    src/main/webapp/WEB-INF/jsp/Copy of kassa.jsp
#	deleted:    src/main/webapp/WEB-INF/jsp/Copy of tack.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/backoffice/order.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/backoffice/orders.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/backoffice/paint.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/backoffice/paints.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/backoffice/price/paint.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/basket.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/index.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/inomhus/vaggar.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/paintproduct.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/payment/cancel.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/tack.jsp
#	modified:   src/main/webapp/WEB-INF/jsp/thnx.jsp
#	deleted:    src/main/webapp/css/fancy_close.png
#	deleted:    src/main/webapp/css/fancy_loading.png
#	deleted:    src/main/webapp/css/fancy_nav_left.png
#	deleted:    src/main/webapp/css/fancy_nav_right.png
#	deleted:    src/main/webapp/css/fancy_shadow_e.png
#	deleted:    src/main/webapp/css/fancy_shadow_n.png
#	deleted:    src/main/webapp/css/fancy_shadow_ne.png
#	deleted:    src/main/webapp/css/fancy_shadow_nw.png
#	deleted:    src/main/webapp/css/fancy_shadow_s.png
#	deleted:    src/main/webapp/css/fancy_shadow_se.png
#	deleted:    src/main/webapp/css/fancy_shadow_sw.png
#	deleted:    src/main/webapp/css/fancy_shadow_w.png
#	deleted:    src/main/webapp/css/fancy_title_left.png
#	deleted:    src/main/webapp/css/fancy_title_main.png
#	deleted:    src/main/webapp/css/fancy_title_over.png
#	deleted:    src/main/webapp/css/fancy_title_right.png
#	deleted:    src/main/webapp/css/fancybox-x.png
#	deleted:    src/main/webapp/css/fancybox-y.png
#	deleted:    src/main/webapp/css/fancybox.png
#	modified:   src/main/webapp/css/index.css
#	deleted:    src/main/webapp/css/jquery.fancybox-1.3.4.css
#	modified:   src/main/webapp/css/order.css
#	modified:   src/main/webapp/css/product.css
#	modified:   src/main/webapp/css/styles.css
#	modified:   src/main/webapp/css/tack.css
#	modified:   src/main/webapp/css/vaggar.css
#	deleted:    src/main/webapp/js/jquery.fancybox-1.3.4.js
#	modified:   src/main/webapp/js/localization/messages_se.js
#	new file:   src/main/webapp/js/topnav.js
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      src/main/webapp/WEB-INF/jsp/kassa_solve.jsp
#	both modified:      src/main/webapp/css/top.css
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	deleted:    html/kassa/p1.png
#	modified:   html/kassa/real_order.html
#	modified:   html/kassa/screen.css
#	modified:   html/mellansteg/screen.css
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	html/kassa/stege.png
#	myapp.war