Added a test, updated Gruntfile and server.js
Adding .travis.yml
Merge branch 'master' into homw

Conflicts:
	server.js
Merge pull request #2 from simon-kim/homw

Added a test & .travis.yml and updated Gruntfile and server.js