resolves merge conflict and changes response status code to proper response status code
creates a more RESTful compliant API
Merge branch 'switch-to-bootstrap' of https://github.com/Rdbaker/SigmaPiGammaIota into switch-to-bootstrap