Layout
Merge branch 'master' of https://github.com/romaleev/feedApp.git

Conflicts:
	bower.json