updated view and controller

added Player buttons
added layouts for the player panels
added get methods for the buttons
added actionListeners to the buttons
print out which button is clicked
Merge branch 'master' into Colin-Dev

Conflicts:
	src/Launcher.java
makeing merge fixes