different questions
Merge branch 'master' of github.com:pfletch1023/MFI-Research
updating question
Merge branch 'master' of git://github.com/pfletch1023/MFI-Research

Conflicts:
	app/assets/javascripts/backbone/templates/game.jst.ejs
	app/assets/javascripts/backbone/views/index.js.coffee
updated about page with disclosure and two questions