Merge pull request #2 from gawrysz/master

updates to .gitignore
Resolve conflicts
Add script that regenerates answer tests
Update hash for mcrwind gold
Merge pull request #6 from gawrysz/master

Minor fixes
Merge pull request #5 from Xarthisius/master

Answer test regeneration