made some changes
Merge branch 'master' of https://github.com/Kunq/hairy-octo-spice

Conflicts:
	octobox/index2.html