First Commit
Merge branch 'master' of github.com:adrianescobar/Blog

Conflicts:
	.gitignore