Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop
changes in travis.yml to get CD working
Merge branch 'fixes' of https://github.com/tochman/codealia into fixes
Made a few changes to travis.yml
Testing if deploy works
Deploy works now. REverted travis to correct api keys
added codealia ide files from old spike
Merge pull request #19 from tochman/pages

Thanks Thomas
Added Git Strategy
Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop

Conflicts:
	.travis.yml
Merge pull request #20 from sampritipanda/develop

Fixed Issues with Travis Continuous Deployment
imported Codealia IDE spike
added codealia_ide.feature
merged with upstream/develop
got jasmine set up
rewrote ide to be instantiable as an instance
added jasmine-jquery-rails gem, added basic specs for ide
updated .travis.yml to run jasmine specs
fixed issue with jasmine ci task, removed code-playground from application.js and set it to precompile independantly
Merge pull request #23 from yggie/codealia-ide

Codealia IDE