Simplified grid templates
Merge branch 'master' of github.com:foxdog-studios/myface

Conflicts:
	src/client/style.css
	src/client/views/grid.coffee
	src/client/views/grid.html