* changing style
resolving conflicts

Merge branch 'develop' of https://github.com/minasdev/minasdev.org into develop

Conflicts:
	src/documents/index.html
	src/documents/styles/stylus/modules/_header.styl
	src/partials/header.html.eco