Sync up
Merge branch 'master' of https://github.com/wforney/template-aspnet-vnext.git