Cleaned up some code and fixed some problems
Merge branch 'master' of github.com:Annoa/Skyline