adds state machine
adds working state machine tests, breaks pagination
fixes pagination
fixes seeder, pagination broken
Revert "adds category model"

This reverts commit 57ae86b72453045f4b3ccfa29740929269f1c83a.

Conflicts:
	db/schema.rb
	spec/features/user_uploads_logo_spec.rb
Revert "add new upload form"

This reverts commit 5b0c1afbf1897ca54275a62ca1f5446969b5bb92.

Conflicts:
	db/schema.rb
	spec/features/user_uploads_logo_spec.rb
fixes pagination
Merge pull request #11 from bcutrell/add_state_machine

Add state machine
setup heroku
configure test environment to use filesystem
Merge branch 'master' into add_category_model

Conflicts:
	app/views/logos/index.html.erb
	db/seeds.rb