generated the feature model
Started controller and model methods
Added features.rb
feature backend code
Merge branch 'master' of https://github.com/GorillaApp/gorilla into feature-model
Feature frontend with color picker
Merge remote-tracking branch 'origin/feature-model' into Feature-frontend
Yes
Merge branch 'feature-model' into Feature-frontend
Feature Back-end plus Front-end. Needs more testing.
Merge remote-tracking branch 'origin/master' into Feature-frontend
Made fixes for code review and added a new feature jquery dialog box.
Merged with master
Added features.js
Removed puts, don't know why the build was breaking because all tests pass.
Merge pull request #19 from GorillaApp/Feature-frontend

Features
Merge remote-tracking branch 'origin/master' into undo-redo

Conflicts:
	Gemfile.lock
	db/schema.rb