fixed branches
Merge branch 'gh-pages'

Conflicts:
	css/.sass-cache/5d06c19bfa83e577a3b7b0e075efa3a0f619c6d7/_global.scssc
	css/.sass-cache/5d06c19bfa83e577a3b7b0e075efa3a0f619c6d7/_incentives.scssc
	js/text-adventure.js
	word-bounce.html
	word-scramble.html