my info
test
Merge branch 'master' of https://github.com/sinholic/dixonsgame

 merge it
Merge branch 'master' of https://github.com/sinholic/dixonsgame
added a useful gitignore file
translations fixes
extra nslog
update
Merge branch 'master' of https://github.com/sinholic/dixonsgame
functional changes