i guess we should ignore the status file
Merge branch 'master' of github.com:awseward/capfromscratch