loginActivity
loginActivity TOBBE
fixed conflicts
Merge branch 'TobbeAndJohn' of github.com:Magrit/miniature-ninja-agile-awesomeness into TobbeAndJohn
startup page