testing
changed Campus: tp campus on the big contact box and small one
Merge remote-tracking branch 'upstream/master'
done
Change css files coding to use h1-h4 instead and made minor changes to contact form to reflect changes requested.
Merge branch 'elaksana-master'

Conflicts:
	app/assets/images/discipleship/elaine.jpg
	app/assets/stylesheets/discipleship.css.scss
Merge branch 'cpaucar-master'