added layouts that adapts to multiple screens
fixed conflicts
Merge branch 'master' of github.com:Magrit/miniature-ninja-agile-awesomeness