Added a test comment to the build based off of the develop branch
Added the following xml views in the "layout" folder:

-main_menu
-multiplayer_game_configuration
-single_player_game_configuration
fixed my files....
fixed my files....
Merge branch 'develop' into heru

Conflicts:
	T3/src/edu/uco/sdd/t3/gameboard/Board.java
fixing changes between develop and heru branch
Merge branch 'heru' into develop