Merge branch 'master' of https://github.com/igtm/sample-backbone-tweet

Conflicts:
	app.js
Merge branches 'master' and 'master' of https://github.com/igtm/sample-backbone-tweet