necessary trouble
Merge branch 'master' of https://github.com/afivos/afivos.com

Conflicts:
	assets/css/style.css
necessary trouble