start on server
remove junk
Merge branch 'master' of github.com:shyndman/genarthack2012

* 'master' of github.com:shyndman/genarthack2012:
  Bug! Fixed!
  Phone client
  Stubs