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

Conflicts:
	index3.html
added some words

added some more stuff
added stuff
added more very important stuff and index3
merged conflict on index2
merged wording conflict on index2
added index3.html
Merge branch 'master' of https://github.com/wdhastings/Spoon-Knife
added some files
Revert "added some files"

This reverts commit 3a6acaf7162cc576dbb1a9d4ce101186cef13c5f.
added some more html
Merge remote-tracking branch 'origin/yesterday'