Added high and low temp data to weekly forecast.
Merge branch 'master' of github.com:Purdue-ACM-SIGAPP/Purdue-App into map-ui
Merge branch 'master' of github.com:Purdue-ACM-SIGAPP/Purdue-App
Fixed a bunch of bugs introduced with my changes. Map searching is currently broken.
Fixed bug with map searching.
Incomplete, but its the start of the XML parsing, and i rearranged some files for packaging
Merge branch 'master' of https://github.com/Purdue-ACM-SIGAPP/Purdue-App
Added functionality to draw a line between user and selected building when they select or search for a building on campus.
Added a few log.d calls around the maps
Merge branch 'master' of github.com:Purdue-ACM-SIGAPP/Purdue-App
Merge branch 'master' into map-ui
Removed unuses xml file.
Ripped drawer layout out of map view. going to replace it with something way cooler. Hopefully.
Beginning work on sports menu. Draawer added, fragments with content aren't
Removed unnecessary Activity instances when I could just reference 'this'.
Temperature now updates itself on temperature scale preference change! #aboutTime
Sports doesn't break, doesn't work
f-ing strings.xml
Merge branch 'master' of github.com:Purdue-ACM-SIGAPP/Purdue-App

Conflicts:
	android/Purdue-App/res/values/strings.xml
Merge branch 'sports'

Conflicts:
	android/Purdue-App/src/edu/purdue/app/PurdueAppActivity.java