discipleship done
woooo
Merge branch 'elaksana-master'

Conflicts:
	app/assets/stylesheets/foundation_and_overrides.scss
updated campus mascot photos, changed group photo, deleted old photos
fixed indentation and changed font to serif
added indentation to paragraphs, fixed pictures of people (bg-circular class), updated description for part 2
Merge remote-tracking branch 'upstream/master'