Added GPU code to master branch
Added HW4 code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore