Start working on order
git rika at to komitnu
git rika at to tam dam
Martinuv commit

Git  rika at to komitnu

Merge branch 'master' of https://github.com/bednarmart/GJA_projekt

Conflicts:
	src/java/net/gjashop/actions/ShoppingAction.java
	src/java/net/gjashop/actions/UserAction.java