fixed

Signed-off-by: unknown <Norbie@NorbieNetbook.(none)>
Merge branch 'master' of https://github.com/joestrong/dress-weather

Conflicts:
	www/js/views.js