Options for settings added (not final design yet)
Merge branch 'master' of https://github.com/philiWeitz/InteractionTechniques.git