branch merge after confict fix.
Add feature-c
Merge branch 'feature-c'
HTML test
Merge branch 'master' of github.com:kobadora/WSGI-practice

Conflicts:
	README.md