Trying out heroku.
Added hello world with express.
Merge branch 'master' of github.com:cbrenton/pokemon

Conflicts:
	package.json
	src/pika.js