first commit to antox
merged with upstream
Removed Home button from WelcomeActivity and its bug
merged latest upstream
Merge remote-tracking branch 'upstream/master' into develop
Deleted project.properties
Merge remote-tracking branch 'upstream/master' into develop
deleted eclipse prefs
Merge pull request #91 from cuttingedge03/develop

Bug fix for app crash in WelcomeActivity
Fixed a crash in SettingsActivity
Merge pull request #96 from cuttingedge03/develop

Fixed a crash in SettingsActivity
Implementing callback methods and adding a friend adds them to your friend list
Forgot callback files
adds devices to readme
Merge pull request #97 from dethstar/master

adds devices to readme
You can now delete friends by long clicking on them
Merge pull request #4 from Astonex/master

latest 10:50 3/9/14