new loop
Merge branch 'master' into fundraiser_time