Null Error Fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	WeatherApp/app/src/main/java/com/fullsail/juanacevedoroman/weatherapp/CurrentAdapter.java
Null Error Fixed