testing conflicts
Merge branch 'master' of https://github.com/davidk90/betawebRepoTest

Conflicts:
	branch1/chef_join.html