Test merge
merge
Merge branch 'master' of https://github.com/QuanSushi/Prog2.git
mhhh
Merge branch 'master' of https://github.com/QuanSushi/Prog2.git

Conflicts:
	AdventureGame/test.java