modif5
modif7
modif9
modif12
modif14
Merge branch 'master' of https://github.com/cwoodrow/git-sandbox

Conflicts:
	README.txt