Tags functionality
Fixed Conflicts
Merge pull request #23 from albertodotcom/alberto

Snippets List
Fixed Conflicts during the merge
Merge pull request #22 from albertodotcom/pranava

Tags functionality
Add delete of snippet
note style
Merge branch 'master' into alberto

Conflicts:
	app/assets/javascripts/controllers/noteCtrl.js
	app/assets/javascripts/views/noteOps.html
Fix error after merging