pulling
Merge branch 'master' of https://github.com/Magrit/miniature-ninja-agile-awesomeness
pulling again
Merge branch 'master' of https://github.com/Magrit/miniature-ninja-agile-awesomeness