finished installing things correctly
Merge branch 'master' of https://github.com/boxl/diamondApp