fist commit
Merge branch 'master' of https://github.com/TiagoDaniel/spree_simple_blog

Conflicts:
	.gitignore
	README.md