Merge pull request #1 from ghaynes1292/master

Added Settings
server changes
added route subscriptions
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.