Merge branch 'master' of C:\Users\RedCrafter1\Desktop\GitHub\Mathvas\Mathvas with conflicts.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\RedCrafter1\Desktop\GitHub\Mathvas\Mathvas with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.js
Merge remote-tracking branch 'origin/master'
update parabole