Started on front page
Merge branch 'master' of https://github.com/jcmack/hackfsm

Conflicts:
	wsgi.py
Fixed conflict