Merge branch 'master' of https://github.com/deviowa/tictactoe

Conflicts:
	js/main.js
merge conflict
fixed merge conflict
Merge branch 'master' of https://github.com/deviowa/tictactoe