modified:   FireSideChat/src/com/example/firesidechat/ChatActivity.java
	renamed:    FireSideChat/src/com/example/firesidechat/web/Location.java -> FireSideChat/src/com/example/firesidechat/Location.java
Merge branch 'master' of https://github.com/jchilton1/fireside-chat

Conflicts:
	FireSideChat/src/com/example/firesidechat/ChatActivity.java
	.git/MERGE_HEAD