editing tutorial
Merge branch 'master' of https://github.com/amuskens/tycoon
editing tutorial
editing tutorial
Fixed conflicts