merge conflict
m c
Merge branch 'master' of https://github.com/kevin-roark/arthur
Merge branch 'master' of https://github.com/kevin-roark/arthur
Merge branch 'master' of https://github.com/kevin-roark/arthur
Merge branch 'master' of https://github.com/kevin-roark/arthur
Merge branch 'master' of https://github.com/kevin-roark/arthur
Merge branch 'master' of https://github.com/kevin-roark/arthur
fixed ArthurSound duration
Merge branch 'master' of https://github.com/kevin-roark/arthur