renamed folder sin(1:x) to sin(1divx) to make cloning easier for windows users
Merge remote-tracking branch 'origin/master'