clean up step one
Merge branch 'master' of https://github.com/jnstcyr/4and20

pulling