feed and create post additions
Merge branch 'master' of https://github.com/kashifshamaz21/chromeapp

Conflicts:
	js/start-up.js
	window.html