(feat) Xianhui HTML5 changes
Merge pull request #67 from andrewzey/feat/HTML5PushState

(feat) Xianhui HTML5 changes
Revert "(feat) Xianhui HTML5 changes"
Merge pull request #68 from rambl/revert-67-feat/HTML5PushState

Revert "(feat) Xianhui HTML5 changes"
(fix) Navbar login status bugs
Merge pull request #69 from andrewzey/fix/navbar-bugs

(fix) Navbar login status bugs
fixed bugs for conflict, however still buggy
changed conflicts and code runs.