First
For file transfer
Can now send HTTP Post messages
Sending HTTP POST form instead of JSON
Fixed merge conflict
Put some of the files into packages
Removed old files
Now loggin in with AsyncTask
Added a progress dialog box which appears after pressing the login button
For merging
Fixed merge conflict
Reinstalling computer
Pushed gameboard before merge with david
Merge pull request #1 from AnotherDay/develop

Develop
Now ignores the .metadata folder
Removed .metadata folder
Merge pull request #2 from AnotherDay/develop

Develop
Removed and added the .settings folder to gitignore
Started on a abstract class for our activities
Started to work on API class