simpler
Merge branch 'master' of https://github.com/CommonAccord/commonaccord

Conflicts:
	.DS_Store
ds
Merge branch 'master' of https://github.com/CommonAccord/commonaccord