test.commit
Merge branch 'master' of https://github.com/clarekat/test

Conflicts:
	test.css
change background color