First
Users
Image, Validate
Notes
Test Delete
Fixing
Fixing
Clear garbage
garbage cleaner
fixing
fixing
Add toolbar
merge conflicts
create elementary scaffolding
Merge branch 'master' of github.com:Desktoper/Desktop-rails

Conflicts:
	.gitignore
Merge branch 'master' of github.com:Desktoper/Desktop-rails

Conflicts:
	.gitignore