Fleshed out server

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>
Merge branch 'master' of https://github.com/feitelsonc/Amp

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>

Conflicts:
	src/com/amp/ServerAsyncTask.java
fixed conflicts

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>