General Update v2.1 w/ Tournaments

This is the update with the new tournament system made by Kota.