took out android manifest from tracked files and added a text box to play with toast. - Joel
Merge branch 'master' of https://github.com/pennja01/NorseSquare

Conflicts:
	Android/AndroidManifest.xml
myeah. - joel