Merge commit '0c17046d86b46be71bb52d46204c2e0f5ad89cb0' into Adesh

Conflicts:
	app.js
	routes/feed.js
	routes/signin.js
	routes/signup.js
	views/feed.jade
	views/layout.jade

PLEASE WORK FROM THIS BRANCH, DONT CREATE ANOTHER ONE !!!!!!!!!!!!!!!
updated layout.jade
Fixed bugs after merging
Layout.jade now well organised
created jade files for header including
Merge branch 'Adesh'

Conflicts:
	app.js
	routes/feed.js
	routes/signin.js
	views/feed.jade
	views/layout.jade