rename
test
Merge branch 'master' of https://github.com/Everything2014/gitDemo

Conflicts:
	demo.txt