bower
Merge branch 'master' of https://github.com/tcb-hr/feed into search
prepping chat model for filter functions
more filter prep
initial implementation of Instagram feed
changed a bunch but for why?
Merge pull request #22 from tcb-hr/instagram

displays tagged photos in real-time from Instagram
merge
Merge branch 'master' of https://github.com/tcb-hr/feed

Conflicts:
	app/scripts/controllers/main.js
	app/views/partials/main.html
	app/views/partials/navbar.html
	bower.json