temp_thing
Merge branch 'master' of https://github.com/chenshifei/GREWords

Conflicts:
	GREWords/src/com/tac/grewords/view/MainActivity.java