changes
Merge branch 'master' of https://github.com/YJimenez/Junkyard

Conflicts:
	.DS_Store