Add variables into user.java
Merge branch 'master' of https://github.com/wensby/ai-project.git

Conflicts:
	bin/Item.class
Merge branch 'master' of https://github.com/wensby/ai-project.git
merging