Updating a conflicting change to test the merge tool setup.
Merge branch 'master' of https://github.com/SwalkerCode/WhenPigsFly

Conflicts:
	WhenPigsFly/WhenPigsFly.html