- build basic feed structure
-front end stuff
Merge commit '71623811f4c808896552ad522d7bcd4324020eea'

Conflicts:
	views/app.sass - use theirs
	views/index.haml  - use theirs