Updating 5/30 #doomsdayschedule
Merge branch 'dev'