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

Conflicts:
	bin/User.class
	src/User.java
Merge branch 'master' of https://github.com/wensby/ai-project.git
Merged, no changes