new one
testing
done
added names to testimonials
Merge branch 'elaksana-master'

Conflicts:
	app/assets/images/discipleship/elaine.jpg
	app/assets/stylesheets/discipleship.css.scss
Merge branch 'cpaucar-master'
Merge branch 'master' into branch_stp_page
fixed arrow on browser resize, tab spacing
new higher quality photo for stp collage
added link to whec page
added new ica logo and removed old one
fix navbar issue and format _header.html file
Campus and Leader Page Update

Almost done, don't have all the pictures yet. Ready for testing
Pulled in latest changes

Mostly done, don't have all the images yet. Ready for test.
Removed pic
vertically centered logo on homepage
changed name of homepage landscape photo
use columns for bg image
changed homepage images to progressive mode
More Final Draft

- added accordion response
- fixed buttons
- fixed images

Stll need:
- leader images
- responsive calendar solution