discipleship done
woooo
Merge branch 'elaksana-master'

Conflicts:
	app/assets/stylesheets/foundation_and_overrides.scss