test conflict
Merge branch 'master' of github.com:teawkungz/Agile-Git

Conflicts:
	Content.rtf