...
- added badge images to adventure game
- modified social comparison to have same trigger points as badges
- added function for levels (similar to badge/leader) -- haven't done anything with this
- added survey questions
- added consent form
Some shit
Merge branch 'gh-pages'

Conflicts:
	css/.sass-cache/5d06c19bfa83e577a3b7b0e075efa3a0f619c6d7/_console.scssc
	css/.sass-cache/5d06c19bfa83e577a3b7b0e075efa3a0f619c6d7/_exposition.scssc
	css/.sass-cache/5d06c19bfa83e577a3b7b0e075efa3a0f619c6d7/_global.scssc
	css/.sass-cache/5d06c19bfa83e577a3b7b0e075efa3a0f619c6d7/_incentives.scssc
	css/sass/_console.scss
	css/sass/_exposition.scss
	css/sass/_global.scss
	css/sass/_incentives.scss
	css/stylesheets/screen.css
	index.html
	js/incentives.js
	js/system.js
	js/text-adventure.js
	text-adventure.html
	word-scramble.html