newChanges
Merge branch 'master' of https://github.com/codletech/commercialCalcs
mychanges
Merge branch 'master' of https://github.com/codletech/commercialCalcs

Conflicts:
	index.html
update styles