Arthur's first push
Arthur's first push

Merge branch 'master' of https://github.com/kdedakia/nyuhacks

Conflicts:
	main.html