Status before adding View.java
Merge branch 'master' of https://github.com/prg2lt7/con4

Conflicts:
	software/con4/src/logic/LocalOpponent.java
Merge branch 'master' of https://github.com/prg2lt7/con4

Conflicts:
	software/con4/src/logic/Controller.java