Heroku
Merge branch 'master' of https://github.com/MinionsHugb/TicTacToe
Heroku master
Merge branch 'master' of https://github.com/MinionsHugb/TicTacToe
Merge branch 'master' of https://github.com/MinionsHugb/TicTacToe

Conflicts:
	src/main/java/is/ru/tictactoe/tictactoe.java