[new] switch page js, combined js files
Merge branch 'master' of https://github.com/HackPrincetonTeamHTHS/ElderScrollsClient

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