Added images, made feed on left hand side
Merge branch 'master' of https://github.com/hssDevelopment/coffeehack

Conflicts:
	angularApp/.idea/workspace.xml
Added feed controller and mock data