this is a commit message
Merge branch 'master' of github.com:carlieh/PHP_InClass

Conflicts:
	readme.md
new files yo