test commit
Merge branch 'master' of https://github.com/vc7/git_class

Conflicts:
	README.markdown