damn you
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge
Merge branch 'master' of
https://github.com/ChristofTorres/eShop-Client.git

Conflicts:
	eShop Client/src/shop/client/net/ShopFassade.java
Merge branch 'master' of https://github.com/ChristofTorres/eShop-Client.git