adding timer to poll messages
	modified:   FireSideChat/src/com/example/firesidechat/ChatActivity.java
	modified:   FireSideChat/src/com/example/firesidechat/web/Server.java
Merge branch 'master' of https://github.com/jchilton1/fireside-chat

out of sync
	.git/MERGE_HEAD