created
merge conflict
Merge branch 'master' of https://github.com/jmluc123/blogsite

Conflicts:
	.gitignore