getting things working w/ jsx & react
Merge branch 'master' of git://github.com/rseymour/Cowell into rseymour-master

Conflicts:
	cowell.js
	index.html
Merge branch 'rseymour-master'