google fix
fixed conflicts
conflict fix
Merge branch 'master' of github.com:Magrit/miniature-ninja-agile-awesomeness