testing with no permission
Merge branch 'master' of https://github.com/robertstarmer/class

Conflicts:
	a_first_file.txt