john is definitely a nignog
Merge branch 'master' of https://github.com/HomeSchooledIT/2DGame.git
.
Merge branch 'master' of https://github.com/HomeSchooledIT/2DGame.git

Conflicts:
	src/StdDraw.java
.
Merge branch 'master' of https://github.com/HomeSchooledIT/2DGame.git
COMMIT