working on test branch
Merge branch 'master' of https://github.com/peterkhayes/Doorbell into addingtests

Conflicts:
	client/index.js
	client/style.css
Merge branch 'master' of https://github.com/peterkhayes/Doorbell into addingtests
added contentType
writing mini ajax module
refactoring easyAjax to allow success and error callbacks
comments for easyAjax
working on tests
tests yay
stetstgst
some more testing work
Merge branch 'master' of https://github.com/peterkhayes/Doorbell

Conflicts:
	client/index.js