working js for eric, some other fixes
Merge branch 'master' of github.com:conwaychriscosmo/Generosity

Conflicts:
	db/schema.rb
fixed font visibility for login screen