changed color shades by 10% instead of 5%
fix merge issues
weird text format issues?
fixed merge issues
cleaned up smallgroups pages
fixed merge conflicts
added ghost buttons
Merge branch 'branch_improved_design'

Conflicts:
	app/assets/stylesheets/about.css.scss
	app/assets/stylesheets/contact.css.scss
added ghost buttons
Merge branch 'ccmolitoris-master'
stupid crlf issues
fixed stp testimonials feature
Merge branch 'master' into branch_stp_page
added discipleship elaine 4gen pic
added actual testimonials
Merge branch 'master' into branch_stp_page
changed button color
initial clearing lightbox programs page, upside-down photos
Merge branch 'master' into branch_programs_page
added stp photos?