Ready to publish
Merge branch 'master' of git://github.com/olliahonen/futucode2013 into olliahonen-master

Conflicts:
	static/index.html