Updated...
Merge branch 'master' of github.com:Magrit/miniature-ninja-agile-awesomeness
added notification...sorta..
conflict merge