yaaayyyyyyyy uurrrrppdates
Merge branch 'master' of https://github.com/cranberryofdoom/hackduke

Conflicts:
	css/main.css
	index.html