So it compiles now (this is the beginning...)
Merge branch 'master' of github.com:Jaemu/cse508