Merge branch 'master' of heroku.com:chatterbackbone

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

Conflicts:
	js/views/Feed.js
Merge branch 'master' into github

Conflicts:
	index.html
Initial revision