changed content
Merge branch 'master' of https://github.com/ccwebdev/test1

Conflicts:
	index.html
This it a random message.
This is the 2nd line.
THis is the 3rd line.