Conflict resolved
Merge branch 'master' of github.com:joshsoftware/intranet