trying to fix the pull request
Merge branch 'remove-extra-landing-page-text'

Conflicts:
	app/styles/app.css
	public/index.html