msg
Merge branch 'master' of github.com:dschwartzer/part4.demo
merged
Conflicts:
	index.txt