README
readme1
Delete README.txt
Create README.md
readme init
made a change
made other change
merge clear
changing
Merge branch 'testing'

Conflicts:
	login.html
rebase
rebase modify