update
Added proj2 and hw3
Merge branch 'master' of https://github.com/stephaniewsu/2014Fall-CS2200

Conflicts:
	hw2/hw2_answers.txt