2nd iteration code
commit 2nd iteration
Merge branch 'master' of https://github.com/frgossen/mossTalk.git

Conflicts:
	bin/MossTalkWordsKelsey.apk
	bin/classes.dex
	bin/classes/edu/cis350/mosstalkwords/MainActivity.class
	bin/resources.ap_
	src/edu/cis350/mosstalkwords/UserDataHandler.java