js revert
commit

Conflicts:
	CSS/style.css
	JS/function.js
	JS/parse_functions.js
	index.html