moved some files into a dir.
 Committer: Connor Matthew Brant <cbrant@student03.cse.nd.edu>
Merge branch 'master' of ssh://github.com/cbrant/final_project

Conflicts:
	graphics/initialTest/Start.png
	graphics/initialTest/initialTest
	graphics/initialTest/initialTest.cpp
	graphics/initialTest/initialTest.cpp~
	graphics/initialTest/ultimate_disc_white.png
	pictures/Start.png

 Committer: Connor Matthew Brant <cbrant@student03.cse.nd.edu>