compresion
Merge branch 'master' of https://github.com/afroldann/ManaWynwood

Conflicts:
	.DS_Store