Cleaned up some warnings.
Merge branch 'master' of github.com:Zethes/Jatta