Getting ready to pull...a great joke! Knock, Knock...
Fixing merge conflicts.Merge branch 'master' of github.com:ghmeier/thewishingwell

Conflicts:
	index.html
Merge branch 'master' of github.com:ghmeier/thewishingwell
Can login with Venmo