Ugh
Merge branch 'master' of https://github.com/PaulJuliusMartinez/simpler_enroll
Updating with live changes
Merge conflicts