Merge pull request #10 from albertodotcom/alberto

Add test for blocknote and note modules
Merge pull request #11 from albertodotcom/alberto

blocknotes controller specs
Specs for the Snippets controller
Merge branch 'master' into versioning
Edited snippet controller spec for destroy method
Merge pull request #12 from albertodotcom/versioning

Versioning
Notes Controller Addition to the codernotes with spec
Merge pull request #13 from albertodotcom/versioning

Notes Controller Addition to the codernotes with spec
Correction in Notes_controller_spec
Merge pull request #14 from albertodotcom/pranava

Correction in Notes_controller_spec
Added Angular Blocknote Service, Edited Blocnotectrl
Merge pull request #15 from albertodotcom/pranava

Added Angular Blocknote Service, Edited Blocnotectrl
Blocknote CRUD in angular
Merge branch 'master' of github.com:albertodotcom/codernotes

Conflicts:
	app/assets/javascripts/controllers/blocknoteCtrl.js
	app/assets/javascripts/services/blocknote.js
	app/controllers/application_controller.rb
delete test_blocknote
add codemirror gem and textangular