Edited pom.xml, adding encoding options and java version 7 used for compiling.
Merge branch 'master' of github.com:EliteMachine/TicTacToe
Solving conflicts, trying to clean up.