Merge branch 'master' of heroku.com:northcantonchurch
Merge branch 'master' of github.com:plaugs/North-Canton-Church
Merge branch 'master' of github.com:nwise/North-Canton-Church
"changes to bg image"
"styling wip"
"h1 tag updates"
Adding DS_Store to gitignore
Removing DS_Store
Requiring Bootstrap startup JS
"bg update"
Updating background image.
Updating link color.
Adding header tags.
removing links from carousel until pages exist.
"changed outdated info on homepage slider."
"minor change to logo"
Adding timezone config
Merge branch 'master' of github.com:nwise/North-Canton-Church
Fixing login button, so it does not appear for the current user.
Making errors appear pretty.