Updated JSX compilation
Fixed merge conflicts
Finished grunt compiling of JSX files
Merge pull request #2 from hooloovooo/master

JSX compilation in grunt.