Init
Merge branch 'master' of github.com:astray0924/cs542_hw4

Conflicts:
	.gitignore