new branch
new branch
test feature commit
test
test
test
Merge branch 'feature/test-feature' into develop

Conflicts:
	javascript/new branch.html
test2
test
Merge branch 'feature/test-feature' into develop

Conflicts:
	javascript/new branch.html
Merge branch 'feature/test-feature2' into develop
start adding mixins and functions