updated grid system
Merge branch 'master' of https://github.com/tallmypeople/web-client

Conflicts:
	app/views/feed.html