commit on a test branch
updated test
Merge branch 'test_branch'
Player controls

Player controls; jump on space bar and left/right with arrows. Simple
graphics added and project is now set to be a 2d project.
UML
Merge branch 'master' of https://github.com/jfiss11/OOSE-Project606

Conflicts:
	git_test.txt