woot
Resolving merge conflicts
Fixing UI issues
Merge branch 'master' into RecruitmentPage2
Merge pull request #8 from ProjectMaxwell/RecruitmentPage2

Merging RecruitmentPage2 into master