Making changes for release #1
making changes for feature #2
Merge branch 'feature_2'
Bolding title and increasing font size
Merge branch 'origin/feature_3'
Merge branch 'origin/release'
Adding Page title to main page
Merge branch 'origin/feature_1'

Conflicts:
	app/partials/phone-detail.html
Merge branch 'origin/feature_4'
Merge branch 'master' into fresh