loginActivity
loginActivity
loginActivity TOBBE
fixed conflicts
adding files
Merge branch 'TobbeAndJohn' of github.com:Magrit/miniature-ninja-agile-awesomeness into TobbeAndJohn
startup page
Merge pull request #8 from Magrit/TobbeAndJohn

Tobbe and john