first commit
2nd commit
added in test branch
added in master branch
commit
Merge branch 'test'

Conflicts:
	app/views/home/index.html.erb
Merge branch 'master' of https://github.com/yaol9/test-blog

Conflicts:
	.gitignore