Play Button
Added some things
Added some things
Merge origin/master

Conflicts:
	The_School_Project/src/theschoolproject/GamePanel.java