cleaned up
cleaned up
added ignore
Merge branch 'master' of https://github.com/dmochi/cs595-f14

Conflicts:
	assignment01/answers.log
	assignment01/answers.pdf