progress
fiveyearplan
progress

added test username bob to beginning of main method. Login sends
directly to registration after username has been entered no matter if it
is correct or not.
Merge branch 'master' of https://github.com/mrvalentin/Apps-shop

Conflicts:
	AppStore/src/appstore/Main.java
Merge branch 'master' of https://github.com/mrvalentin/Apps-shop