really got rid of action mailer
Merge branch 'master' of github.com:schechter/FishStoreGame