testing category change
Merge branch 'master' of https://github.com/jennylia/SFUHack