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.
Conformed Changes
Merge remote-tracking branch 'upstream/master'
Add images
Conform to Standard CSS
Set Accordion Content Height
Merge branch 'master' of https://github.com/jackwcao/ica_mob

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/common.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	app/assets/stylesheets/ucla.css.scss
	app/views/ucla/home.html.erb
	app/views/ucla/leaders.html.erb
Merge branch 'jackwcao-master'

Conflicts:
	app/assets/stylesheets/common.css.scss
	app/assets/stylesheets/discipleship.css.scss
	app/assets/stylesheets/ucla.css.scss