new
Merge branch 'master' of https://github.com/orviwan/Chunk-Weather-v2.0

Conflicts:
	appinfo.json
	src/chunk.c
	src/js/pebble-js-app.js