markO test c2
Minor bug fix
Merge branch 'master' of https://github.com/Apakettir/TicTacToe
Mark functions and tests operational
Mark komid i lag
Merge branch 'FreyrGG'

Conflicts:
	src/main/java/is/ru/tictactoe/TicTacToe.java
	src/test/java/is/ru/tictactoe/TicTacToeTest.java
Added dependency to cobertura
Update .gitignore
Delete .DS_Store
Breytti breytunofnum
Merge branch 'master' of github.com:Apakettir/TicTacToe
Check win komid
Check win komid i lag
Added cobertura and site scripts
Merge branch 'master' of github.com:Apakettir/TicTacToe
added 1 test
Merge branch 'Frank2'
javascriptu breytingar
Merge branch 'master' of github.com:Apakettir/TicTacToe