IT WORKS NOW (FTW)
Merge branch 'master' of github.com:oraac/ewu-cscd540