class stuff
Merge branch 'master' of https://github.com/IDMNYU/DM2193FA2014

Conflicts:
	week_03/johnny/styles/styles.css