Here is a commit message
Merge branch 'master' of github.com:amcgowanca/fanshawe-info-5093-w2013-example

Conflicts:
	README.md
New files