Stella's settings
Merge branch 'master' of https://github.com/Vladimiroff/massive-octo-ninja