Merge branch 'master' of https://github.com/freshlifechurch/intern.freshlifechurch.com
Fixing Conflict

Conflicts:
assets/css/main.css