Added drawing functions and fixed settingsPanel
Merge branch 'master' of https://github.com/mschuurmans/random_name_for_repository