Fix all the crashing
Merge branch 'master' of github.com:elliottsj/transit-watch

Conflicts:
	android/app/src/main/java/ca/cryptr/transit_watch/activities/StopsActivity.java
	android/app/src/main/java/ca/cryptr/transit_watch/util/FileIO.java
	src/app.c
Merge branch 'master' of github.com:elliottsj/transit-watch
Merge branch 'master' of github.com:elliottsj/transit-watch