Added cobertura to gradle
Console logging on test task
Merge conflict fixes
Merge branch 'master' of github.com:TheSkittles/TicTacToe