Some text has been added
Some text has been added
Merge branch 'b' of https://github.com/goYourOwnWay/git_project into b

Conflicts:
	index.html