fixed shit
Merge branch 'master' of github.com:TechAtNYU/feedbackmachine