DB copy
Merge branch 'master' of https://github.com/TallerWebSolutions/blog
Merge branch 'master' of https://github.com/TallerWebSolutions/blog
Added images to ignore.
Added sass cache to ignore.
Merge branch 'master' into dev

Conflicts:
	.gitignore