getting macbook working
merging stuff
Merge branch 'master' of github.com:luisilva/clutchpy