Forced Commit to Overwrite
Merge branch 'master' of https://github.com/Jtread0000/Hummingbird-DEV

Conflicts:
	client/.serve/index.html
	client/.serve/styles/main.css
	client/.serve/styles/main.css.map
	client/styles/UHC-main.less
	client/styles/UHC-variables.less
	client/templates/components/top-nav.jade

:Quit
:quit
:qxit
:exit
Fixing Merge Errors