Fix bad merge
Merge branch 'master' of https://github.com/nickelbob/SurfSpotter

Conflicts:
	src/com/example/surfspotter/MainActivity.java
	src/com/example/surfspotter/RSSReader.java