Merge branch 'gh-pages' of github.com:captn3m0/mage into gh-pages

Conflicts:
	index.html
	main.js