Merge pull request #56 from californiavol/master

merge master into macbook-branch
Merge pull request #57 from californiavol/imac-work

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

Merge pull request #56 from californiavol/master
Merge pull request #59 from californiavol/master

merge from master
styling and layout updates
Merge pull request #60 from californiavol/macbook-branch

Macbook branch
Merge pull request #61 from californiavol/master

Merge master into imac-work