stash this
Merge branch 'master' of https://github.com/danylaksono/projectquantan

Conflicts:
	css/style.css
	index.html
reset
Merge branch 'master' of https://github.com/danylaksono/projectquantan