working except checking properly for range
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	src/main/java/com/weatherornot/weatherornot/DisplaySettingsActivity.java
	src/main/java/com/weatherornot/weatherornot/DisplayWeatherActivity.java
	src/main/java/com/weatherornot/weatherornot/SnarkyDisplay.java