ignored more crap
Merge branch 'master' of github.com:cLuuLess/cse231