Merge branch 'master' of https://github.com/dgrant069/Grubly into dylan
navbar working mostly
basic application html
more html changes
app html upgraded a little
app html upgraded a little