merge update
Merge branch 'master' of http://github.com/igrandom/othello
changed filenames
merge conflict repair