Merge pull request #1 from krlecarp/funnytest

this should be committed
Create README.md
Update index.html
merged files try two
Trying to commit with "I plan to merge this soon"
Merge branch 'master' into funnytest

Conflicts:
	index.html