Untracked files being added. .txt files and .xml, the src folder.
Merge branch 'master' of github.com:EliteMachine/TicTacToe
Edited pom.xml, adding java versionand encoding options.
Resolving conflict. Cleaning up.