Test app.jade
Merge branch 'dev' of https://github.com/terriblesarcasm/Axihub into dev

Conflicts:
	views/app.jade