Updated provision
Merge branch 'master' of https://github.com/ben-chin/techhub

Conflicts:
	.gitignore