trying to fix bug
Merge branch 'master' of github.com:Magrit/miniature-ninja-agile-awesomeness
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
Google +
Google+ take 2
Merge branch 'master' of github.com:Magrit/miniature-ninja-agile-awesomeness
G blabla
Google+ Fest
login screen
Google wring version
export page added
export page added
Merge branch 'master' of github.com:Magrit/miniature-ninja-agile-awesomeness