lining up bullets
Merge branch 'master' of https://github.com/wearecharette/cap

ok