Added nav bar & about section
Merge branch 'master' into huy
Merge branch 'huy'
merge conflict