index,index.css
login.css
Merge branch 'master' of https://github.com/vikoumo/blog.git

Conflicts:
	public/images/favicon.jpg
	public/stylesheets/index.css
	views/header.ejs
	views/index.ejs