Ken's 2nd commit
Merge branch 'master' of https://github.com/klai12/mbta-app

Conflicts:
	WreckANiceBeach/AndroidManifest.xml
	WreckANiceBeach/project.properties
	WreckANiceBeach/res/layout/activity_main.xml
	WreckANiceBeach/res/values/strings.xml
	WreckANiceBeach/src/com/example/wreckanicebeach/FindStopActivity.java
	WreckANiceBeach/src/com/example/wreckanicebeach/MainActivity.java