testing
test commit
Merge pull request #4 from CS180Fall2014/map

test commit again
Merge pull request #3 from CS180Fall2014/cole

testing
testing
Beginning layout fragment
Beginning layout fragment
Merge pull request #5 from CS180Fall2014/cole

added beginning login layout
base login view
Merge pull request #9 from CS180Fall2014/cole

base login view
Skeleton for Profile

Added the skeleton for the profile page
Merge pull request #14 from CS180Fall2014/Keshav

Skeleton for Profile
Changed name of Login
Merge pull request #16 from CS180Fall2014/cole

Changed name of Login
Added Google Map API
Registered Google API key in Google Services
Merge remote-tracking branch 'origin/UI' into map

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/murraycole/ucrrunner/view/MyActivity.java
	app/src/main/res/values/strings.xml
Added route drawing for Map
Merge pull request #25 from CS180Fall2014/map

Map