Merge branch 'master' of https://github.com/BowenChan/CS-174-Website-Project

Conflicts:
	Presentation and Files/2014 TeamProject3 Presentation 1212014.ppt