made pretty for git
Merge branch 'master' of github.com:bambooforest/features