Merge pull request #2 from shawnsandy/develop

Develop
Merge pull request #3 from shawnsandy/develop

Updates
Updated -styles
desktop - min-width: 1282
deleted jugs changes made to master
delete fix
Merge branch 'develop'

Conflicts:
	stylesheet.css
Merge pull request #5 from shawnsandy/develop

changed margin bootom to 0;
bootstrap updates
them dev updates
added font awesome
Merge branch 'develop' of github.com:shawnsandy/theme-starter into develop