Merge branch 'master' of https://github.com/TeamChahlie/BurgerBar

Conflicts:
Web/api/index.php
ugh