update gitignore
put resources back into git
Merge branch 'master' of github.com:gamemachine/gamemachine