Merge pull request #52 from californiavol/master

merged macbook with master
Merge pull request #53 from californiavol/imac-work

Imac work
Merge pull request #54 from californiavol/macbook-branch

Merge pull request #52 from californiavol/master
Merge pull request #55 from californiavol/master

Merge master into imac-work