edited main.js
Merge branch 'master' of https://github.com/MyHatIsAwesome/hackmanchester2013

Conflicts:
	Webby/js/main.js