Fet1 first commit
Changes in develop
Feature 1 second commit
Changes in dveelop after feat1 second commit
Merge branch 'feature/fet1' into develop

Conflicts:
	test.html
Bug fix on release1.0