fix
Merge branch 'master' of https://github.com/morenature/TravelBlog

Conflicts:
	assets/css/style.css