Added coffee script
Merge branch 'master' of https://github.com/trendwerk/trendpress-child

Conflicts:
	assets/js/functions.js