checking status
Merge branch 'master' of https://github.com/ashabbir/blog

Conflicts:
	app/views/welcome/index.html.erb