Revert "sync"

This reverts commit cc02c7eeaf65bb0119e3d2402f40c7cd1fa21911.
Merge branch 'master' of github.com:bukka-/calculatr

Conflicts:
	index.html
	js/main.js