Merge branch 'master' of github.com:helpful/helpful-intranet

Signed-off-by: Luke Oatham <lukeoatham@gmail.com>

Conflicts:
	README.md
Merge branch 'master' of github.com:helpful/helpful-intranet