Insert text for the intro
Merge branch 'master' of github.com:alexisfasquel/growstuff-front

Conflicts:
	app/index.html