Test
Test

Test
Merge branch 'master' of https://github.com/smodekurti/Weather

Conflicts:
	www/js/app.js