Initial commit on branch 'jordan'
Added a try/catch to resolve a pointer exception
Added preference map to Index activity
cleaned up code
Added a map to the MapFragment. Removed a superfluous 'return' from a void method.
cleaned up code and got rid of bugs
Merge remote-tracking branch 'origin/master'
cleaned up code and got rid of bugs
Renamed to DrawMapFragment to avoid name collisions with api classes. Some modifications to getMap properly
Fixed SolidTheme bug
Resolved runtime issues and added code that draws a marker on a map.
Merge branch 'jordan'

Conflicts:
	adventure/src/main/java/com/djr/adventure/RouteActivity.java
	adventure/src/main/res/layout/activity_route.xml
	adventure/src/main/res/values/styles.xml
Merge branch 'Rafi'

Conflicts:
	adventure/src/main/java/com/djr/adventure/SplashActivity.java
	adventure/src/main/java/com/djr/adventure/YelpActivity.java
Added buttons
Added buttons
Merge branch 'master' of https://github.com/jordansved/NYCAdventureGenerator
Merge branch 'Daniel'

Conflicts:
	adventure/src/main/AndroidManifest.xml
	adventure/src/main/java/com/djr/adventure/IndexActivity.java
	adventure/src/main/java/com/djr/adventure/RouteActivity.java
	adventure/src/main/java/com/djr/adventure/TabManager.java
	adventure/src/main/res/layout/map_fragment.xml
Merge branch 'Daniel'

Conflicts:
	adventure/src/main/AndroidManifest.xml
	adventure/src/main/java/com/djr/adventure/IndexActivity.java
	adventure/src/main/java/com/djr/adventure/RouteActivity.java
	adventure/src/main/java/com/djr/adventure/TabManager.java
	adventure/src/main/res/layout/map_fragment.xml
Merge branch 'Daniel'

Conflicts:
	adventure/src/main/AndroidManifest.xml
	adventure/src/main/java/com/djr/adventure/IndexActivity.java
	adventure/src/main/java/com/djr/adventure/RouteActivity.java
	adventure/src/main/java/com/djr/adventure/TabManager.java
	adventure/src/main/res/layout/map_fragment.xml
Merge branch 'Daniel'

Conflicts:
	adventure/src/main/AndroidManifest.xml
	adventure/src/main/java/com/djr/adventure/IndexActivity.java
	adventure/src/main/java/com/djr/adventure/RouteActivity.java
	adventure/src/main/java/com/djr/adventure/TabManager.java
	adventure/src/main/res/layout/map_fragment.xml
THIS IS WORKING