removed merged files
Merge branch 'master' of github.com:johnfitzpatrick/apache-chefconf14

Conflicts:
	files/default/jaf_index.html