fix twitter, move object
Merge branch 'master' into kyle

Conflicts:
	dev-duel.js