Deleted a file.
added index2
added index3.html
Merge branch 'mybranch'
Inserted stuff
added stuff
Merge branch 'master' of https://github.com/wdhastings/Spoon-Knife

Conflicts:
	index3.html