ignore
Merge branch 'master' of https://github.com/yerenyo/iOSClass

Conflicts:
	.DS_Store