Merge branch 'master' of https://github.com/HackPrincetonTeamHTHS/ElderScrollsClient

Conflicts:
	css/main.css
	css/main.less
semi-finalized results
Merge branch 'master' of https://github.com/HackPrincetonTeamHTHS/ElderScrollsClient

Conflicts:
	css/main.css
	js/end.js