updated for reading in question json
Merge branch 'master' of git://github.com/zadmarbella/fastinterview into zadmarbella-master

Conflicts:
	js/main.js