New way of doing stuff
Finished index.html
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-frontend

Conflicts:
	js/modules.js