Merge branch 'John' into Cole
Merge branch 'master' into Cole
Merge branch 'John'
typo

typo
Merge branch 'John'
Merge branch 'John'
Merge branch 'master' into Cole
Merge branch 'John'
Drag slider bar A
Merge branch 'Cole'
remove duplication of onclickA
Merge branch 'John'

Resolved conflicts
Merge branch 'master' into John