add even more stuff
Merge branch 'master' of github.com:Vladimiroff/massive-octo-ninja