test

Conflicts:
	TDA550Lab3/bin/orig2014/v2/GameController.class
	TDA550Lab3/bin/orig2014/v2/GameModel.class
	TDA550Lab3/bin/orig2014/v2/GameView.class
	TDA550Lab3/bin/orig2014/v2/GoldModel.class
	TDA550Lab3/bin/orig2014/v2/ReversiModel.class
	TDA550Lab3/src/orig2014/v2/GameModel.java
	TDA550Lab3/src/orig2014/v2/GameUtils.java
	TDA550Lab3/src/orig2014/v2/GoldModel.java
	TDA550Lab3/src/orig2014/v2/ReversiModel.java