jchess
merge conflict
fix
another fix
another minifix
i have work to do
merge conflict
blah
Merge branch 'master' of github.com:Chesscademy/App
hope this works