First commit
Merge branch 'master' of https://github.com/smmaus/SWEAP-Coding-Challenge