9/18/2013
Merge branch 'master' of https://github.com/grayfuse/sva-slowcode-2013

Conflicts:
	students/Week 1/Gochman_Clock/background.jpg
	students/Week 1/Gochman_Clock/background2.jpg
	students/Week 1/LukeStern_Assignment1/data/flava.jpg