fancy adding page and js things
MERGING STUFF WOOO
Merge branch 'master' of https://github.com/mattmolo/HackIllinois
wrong dir