Mac OSX ignore
Merge branch 'develop' into live-site
Addition of site-specific CSS files
jumbotron shaodw
Jumbotron shadow
Upgraded bootstrap theme
Conflict resolution