Fixed shit so it works
Merge branch 'master' of github.com:edenzik/128Project