Changed a lot of codes
Merge branch 'master' of https://github.com/Zerith90/IS480