remove schema.rb and migration
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/fetsite/fetsite
Merge branch 'master' of https://github.com/fetsite/fetsite