fix all the bugs!
Merge branch 'master' of github.com:alvivar/minimalisthejourney