clean up
Merge branch 'master' of https://github.com/talzag/Cairo-projects

Conflicts:
	.DS_Store
more cleanup