first commit
Merge branch 'master' of github.com:zozzALive/railsblog

Conflicts:
	.gitignore