Basic API functional and tested.
Merge branch 'master' into merge-update

Conflicts:
	server/lib/match/index.js
combined index and username in merge.
removed merge junk
Merge pull request #143 from amida-tech/merge-update

Merge update