moving bootstrap around
Merge branch 'master' of github.com:gibiansky/adventurer