modified mainactivity to fix location
Merge branch 'master' of https://github.com/jchilton1/fireside-chat.git

Conflicts:
	FireSideChat/src/com/example/firesidechat/MainActivity.java