did more stuff
Merge branch 'master' of github.com:magicmark/goatbook
dfsdf