Created user_profile_txt function in Parser.java
Merge branch 'master' of https://github.com/wensby/ai-project.git

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