merging with master
Merge branch 'master' of https://github.com/wzaghal/twitter-stream

Conflicts:
	app/index.html