Implemented a very simple server
Merge branch 'master' of github.com:bigpandaio/testangular

Conflicts:
	Gruntfile.js