Add local changes
Merge branch 'master' of https://github.com/JoseTomasTocino/slimpost

Conflicts:
	assets/css/style.css