Merge
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Merge
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

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

Conflicts:
	src/Model/MainHub.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

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

Conflicts:
	src/Model/MainHub.java