weather API
documentation, typo fix
ts to timestamp in url
cache namespacing, jshint fixes....
Added basic error reporting for the API
comparison bugfix
documentation out -> supplied in pull request 49
merged upstream master
Merge pull request #47 from Hilzu/errorhandling

Added basic error reporting to API
Re-add dependencies removed by merge in master
Merge branch 'master' of github.com:elnygren/festapp-server into elnygren-master

Conflicts:
	README.md
	package.json
Merge pull request #53 from Hilzu/fix-package-json

Re-add dependencies removed by merge in master