adding front-end
Merge branch 'master' of github.com:jerryjliu/hackny2013 into jerry
finished json prototype, most of js, now prototyping details page
largely implemented front-end, now pulling from master
Merge branch 'master' of github.com:jerryjliu/hackny2013 into jerry

Conflicts:
	backend/getresults.php
commit before merge
made site prettier
committing change before merge
Merge branch 'luke' of github.com:jerryjliu/hackny2013 into jerry

Conflicts:
	backend/apicalls.php
	backend/getresults.php