stuff
Merge branch 'master' of https://github.com/phorust/CS164-Final

Conflicts:
	quickslide.css