console test
Merge branch 'master' of https://github.com/inoyakaigor/htdocs.mix

Conflicts:
	css/custom.css