derp
Merge branch 'master' of https://github.com/klm2193/E155_Final_Project

Conflicts:
	Thumbs.db
Merge branch 'master' of https://github.com/klm2193/E155_Final_Project

Conflicts:
	Thumbs.db