Shorten tagline to "ithappens 20% cooler"
Merge branch 'develop'

Conflicts:
	package.json