init
Merge branch 'master' of http://github.com/micfan/blog_rails

Conflicts:
	.gitignore