Sorcery Install
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into heather

Conflicts:
	db/schema.rb
Attr accessible stuff