minor changes that will cause terrible problems :(
Merge branch 'master' of github.com:gibiansky/adventurer
Merge branch 'master' of github.com:gibiansky/adventurer
Merge branch 'master' of github.com:gibiansky/adventurer