idk
Merge remote-tracking branch 'upstream/master'
Polished off settings

Settings now has AM/PM, time input, route select and stop select, and on
subscribe sends to server.
Fixed adding stop subs and deleting stop subs

Now adding and deleting stop subs works.
worthless
wothless
ignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	android/app/src/main/java/com/foobar/app/BusStop.java
	android/app/src/main/java/com/foobar/app/SettingsActivity.java
	android/app/src/main/java/com/foobar/app/StopSubscription.java
Continue editing Settings

Added timepicker, fixed adding sub, deleting sub. works
Merge pull request #2 from ghaynes1292/master

Polished off settings