Initial commit
Merge branch 'master' of https://github.com/jbenoit2011/jbblog

Conflicts:
	.gitignore
	README.md