naman fixed griffin's idiocy
Merge branch 'master' of github.com:akhilaananthram/CS4701

Conflicts:
	temp.png

just restating that griffin is an idiot :)