New Function History
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/styles/style.css
	src/main/webapp/worker.html
updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/styles/style.css
	src/main/webapp/worker.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/styles/style.css
	src/main/webapp/worker.html