form updates
Merge branch 'master' of https://github.com/kathrynsiegel/busme
navbar edits
merge resolution