localhost
Merge branch 'master' of https://github.com/erictanweb/dfar

Conflicts:
	app/views/layout.server.view.html