woot
Resolving merge conflicts
Fixing UI issues
Merge branch 'RecruitmentPage2' of github.com:ProjectMaxwell/EAC-UI into RecruitmentPage
Resolving merge conflict