renamed top-level dirs.
added .DS_Store to .gitignore
Create README.md
Recompile node-xmpp at current version. Fix XMLHTTPRequest bug.
Merge branch 'master' of github.com:UWNetworksLab/UProxy
pass correct arguments to xmppdaemon
switch to non-experimental identity API
Merge branch 'master' into oauth

* master:
  switch to non-experimental identity API
  pass correct arguments to xmppdaemon
  Recompile node-xmpp at current version. Fix XMLHTTPRequest bug.
  Create README.md
  added .DS_Store to .gitignore
  renamed top-level dirs.

Conflicts:
	app/launch.js