new files
Merge branch 'master' of https://github.com/jlcohoon/Pretend-Repo

Conflicts:
	pretend file.html