delete
Merge branch 'master' of github.com:venelrene/Gems

Conflicts:
	TheIronYard/.DS_Store