Merge pull request #1 from cavenmitchell/develop

Develop
Merge pull request #2 from cavenmitchell/css

Css
Merge pull request #4 from cavenmitchell/master

update from master