Fixing previous commits
Merge branch 'master' of github.com:beeker/bitstarter