rake task to charge users weekly for donations
fix merge conflict