changed my previous commit that broke stuff
Merge branch 'master' of https://github.com/tktran/csulb-ff