added more server files
Merge branch 'master' of https://github.com/nicolechung/chatty

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Signed-off-by: Nicole Chung <nchung@nascentdigital.com>
Merge branch 'master' of https://github.com/nicolechung/chatty

Signed-off-by: Nicole Chung <nchung@nascentdigital.com>

Conflicts:
	server.js