Commit to pull.
Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	src/View/ShoppingView.java
Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	src/View/ShoppingView.java