no message
Merge branch 'master' of https://github.com/whoshuu/chimerider

Conflicts:
	src/com/example/chimerider/LaunchActivity.java