Began real work on 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:
	bin/classes.dex