another commit
Merge branch 'master' of https://github.com/hopek/psychic-bear.git

Conflicts:
	src/com/pgs/hopek/androidtesstgit/NewActivity.java