Scroll now isolated to feed div.
Now have a directive for auto-scroll feed to bottom.
Merge pull request #14 from tcb-hr/search

Search fixed
Merge branch 'master' of https://github.com/tcb-hr/feed into search
Code cleanup.
file upload
Merge branch 'scrollfix'

Conflicts:
	app/scripts/controllers/main.js
	app/views/partials/main.html
Merge pull request #15 from janaspage/master

Scroll-fix
file uplaod almost
this merge mess is a place