Creating template
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.openshift/markers/README
	README.md
	config.ru
Merge remote-tracking branch 'openshift/master'
ugly hack to scrape twitter and display