fixed it...no thx to egger
Merge branch 'master' of https://github.com/Ace4/cs325