Feature frontend with color picker
Merge remote-tracking branch 'origin/feature-model' into Feature-frontend
Yes
Merge branch 'feature-model' into Feature-frontend
fixed autosave
Merge pull request #17 from GorillaApp/fixedAutosave

fixed autosave
fixed autosave AGAIN
Merge pull request #18 from GorillaApp/fixedAutosave

fixed autosave AGAIN
Feature Back-end plus Front-end. Needs more testing.
Merge remote-tracking branch 'origin/master' into Feature-frontend
Merge branch 'master' of https://github.com/GorillaApp/gorilla into feature-model
got rid of save_date field for autosave objects, added more tests for autosave_spec.rb
Merge pull request #20 from GorillaApp/fixedAutosave

got rid of save_date field for autosave objects, added autosave tests
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 branch 'Feature-frontend' of https://github.com/GorillaApp/gorilla into feature-model
added a test that is commented out, nothing should change