Merger

Merge the branches made between bag day and the end of the first day of competition into master.