merge
Merge branch 'master' of github.com:webquote/project
modify title
merge
test
Merge pull request #1 from webquote/develop

Develop
Merge branch 'develop'
Merge branch 'master' of github.com:webquote/project
Merge branch 'develop'
Add scale module.
test
Merge branch 'develop'

Conflicts:
	index.html
Merge branch 'develop'
Add the decimals argument.