commit local
Merge branch 'master' of github.com:TRIPTYK/triptyk-grunt

Conflicts:
	app/index.html