need to be checked
Needs to be checked
Merge branch 'master' of https://github.com/kyunpark/PlayHavatar.git

Conflicts:
	app/javacodes/ColumnGuesser.java