getting everything all ready
Merge branch 'master' of github.com:wickett/gary