Removed img src tag from showing up in chat message
Merge branch 'search' of https://github.com/tcb-hr/feed into fixPictures
Merge branch 'search' of https://github.com/tcb-hr/feed into fixPictures
Merge branch 'search' of https://github.com/tcb-hr/feed into fixPictures
Merge branch 'search' of https://github.com/tcb-hr/feed into fixPictures
test merge
Added persistent error logging (to file) for database
Angular-ized pic/photo display
Merge pull request #41 from tcb-hr/fixPictures

Fix pictures
Toggle buttons for filter
Merge pull request #43 from tcb-hr/search

Search
Merge branch 'master' into filters

Conflicts:
	app/views/partials/main.html
Merge pull request #42 from tcb-hr/filters

Toggle buttons for filter
routing
routing
fixing bork
Merge branch 'master' into search