styling
Merge branch 'master' of https://github.com/timeToApp/timeTo

Conflicts:
	app/public/js/templates-build/templates.js
added grid class
styling