Merge branch 'master' of https://github.com/minhuyen/firststep
Merge branch 'master' of https://github.com/minhuyen/firststep
Merge branch 'master' of https://github.com/minhuyen/firststep

Conflicts:
	wsgi/openshift/firststep/templates/firststep/home.html