Add DS_STORE to the git ignore list
A very small documentation improvement
Another fix
update to wisdom

Merge branch 'master' of https://github.com/wisdom-framework/wisdom
Merge branch 'master' of https://github.com/wisdom-framework/wisdom
Merge branch 'master' of https://github.com/wisdom-framework/wisdom
Merge branch 'master' of https://github.com/wisdom-framework/wisdom
Corrected grammar in documentation..more to come
Merge branch 'master' of https://github.com/wisdom-framework/wisdom

Conflicts:
	.gitignore
	documentation/src/main/resources/assets/composition.ad
Merge branch 'master' of https://github.com/wisdom-framework/wisdom
Merge pull request #86 from jenf11/master

Small improvements in the documentation (more to come)