Initial Revision
Initial Revision
Merge branch 'master' of heroku.com:chatterbackbone

Conflicts:
	js/main.js
	js/views/Feed.js
Merge branch 'master' of heroku.com:chatterbackbone

Conflicts:
	js/main.js
	js/views/Feed.js
Merge branch 'master' of heroku.com:chatterbackbone

Conflicts:
	js/views/Feed.js