Something with 404.html
Merge branch 'master' of https://github.com/Azubuso/azubuso.github.io

Conflicts:
	404.html
	CNAME
	README.md
	css/component.css
	css/style.css
	fonts/.DS_Store
	fonts/codropsicons/.DS_Store
	fonts/codropsicons/codropsicons.eot
	fonts/codropsicons/codropsicons.svg
	fonts/codropsicons/codropsicons.ttf
	fonts/codropsicons/codropsicons.woff
	fonts/codropsicons/license.txt
	fonts/icomoon.dev.svg
	fonts/icomoon.eot
	fonts/icomoon.svg
	fonts/icomoon.ttf
	fonts/icomoon.woff
	index.html
	js/modernizr.custom.js
	js/plax.js
Wrong location[B