fucking shit
Merge branch 'master' of https://github.com/erickespinoza/outofspace

Conflicts:
	.DS_Store