Some changes.
Merge branch 'master' of https://github.com/wensby/ai-project

Conflicts:
	bin/Item.class
	bin/User.class
	src/Main.java
	src/User.java