Do I really have to commit in order to merge?
Merge branch 'master' of git@github.com:JornWildt/Ramone.git
Fixing some smaller issues.