Merge branch 'master' of https://github.com/Capsgroup4/capstone.git
Merge branch 'master' into dev.a
#2,3,9 done. Clock adjusted to seconds.
Merge remote-tracking branch 'origin/master'
#2,3,9 done.