Stashing
Merge branch 'master' of github.com:daflad/AstralBridge

Conflicts:
	app/routes/routes.go
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
Merge branch 'master' of github.com:daflad/AstralBridge
app/routes/ added to git path