change
Merge branch 'master' of https://github.com/IOS40/IOS40

Conflicts:
	.DS_Store