css
Merge branch 'master' of https://github.com/stpddream/whoisgoingtodc

Conflicts:
	app/views/shared/_feed.html.erb

csscsskb:qkbwq:wq:qkrkbkbkbikrkrkrkbkbkbkb:wqkbkbq:qkbkbkbwkb:wq:q!