Merge branch 'master' of https://github.com/erictrose/WPF_EricRose

Conflicts:
.idea/workspace.xml
index.html
Day 5 Commit
Day 5 Commit 2
Day 5 Commit 3
Merge branch 'master' of https://github.com/erictrose/WPF_EricRose

Conflicts:
	.idea/workspace.xml
	index.html