Rejected commit: Default
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/class/Sort.class.js
Rejected commit: Default