commiting befor machine crashes
Merge branch 'master' of github.com:ivarconr/feature-toggles-presentation