UCLA Home Drafts

added UCLA home, css, and images.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'icamain/master'
Merge remote-tracking branch 'icamain/master'
Added Foundation
'Conclict'
Editing Conflict
Edit two

add new campus page, new leaders page.
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
Conformed Changes
Merge remote-tracking branch 'upstream/master'
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