edits to title tag
Merge remote-tracking branch 'origin/front-end-conflict' into front-end-conflict

Conflicts:
	index.html