model simple test and first integration test
prepare to merge
Merge branch 'master' into test
pull changes before server changes
pull changes before server changes
Merge branch 'master' into test
merged with master
add dependency 'superagent'
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	package.json
typo in server
fixed tests to match new startup process
Merge pull request #5 from Kreees/test

Test examples