merge
Merge branch 'master' of https://github.com/krisavage/CS180PROJECT
merge
merge
Merge branch 'master' of https://github.com/krisavage/CS180PROJECT

Conflicts:
	ScottyTalk/bin/classes.dex
	ScottyTalk/bin/resources.ap_