cleaned up weather fragment and added gps
Fixed merge conflict in main activity
Added short toast to notify user weather is being pulled