Add navbar
Change jade
Change jade
Change jade
Merge branch 'dev' of https://github.com/terriblesarcasm/Axihub into dev

Conflicts:
	views/app.jade
change div to nav
Edit navbar
Edit navbar, remove margin
change width
add width
Merge branch 'dev' of https://github.com/terriblesarcasm/Axihub into dev

Conflicts:
	public/css/main.css
Edit navbar style
Style navbar, make max pagewidth 960
Style things
Merge branch 'dev' of https://github.com/terriblesarcasm/Axihub into dev

Conflicts:
	views/app.jade
remove class from ng-view
add class to ng-view with margin
Style navbar
Merge branch 'dev' of https://github.com/terriblesarcasm/Axihub into dev

Conflicts:
	public/css/main.css
Change bootswatch