stuff
Persistent favourites
WTF MERGE CONFLICTS
Merge branch 'master' of github.com:GlenKelley/govhack into foo

Conflicts:
	app/src/org/govhack/vespene/LocationTracker.java
	app/src/org/govhack/vespene/MainActivity.java
whitespace
MORE WTF WTF
Merge branch 'master' into foo

Conflicts:
	app/src/org/govhack/vespene/MainActivity.java
Merge branch 'master' of github.com:GlenKelley/govhack into foo

Conflicts:
	app/src/org/govhack/vespene/MainActivity.java