shit DS.Store
Merge branch 'dev-102013' of https://github.com/BowlMinions/Pasion-por-la-moda into dev-102013
edit git ignore
Merge branch 'dev-102013' of https://github.com/BowlMinions/Pasion-por-la-moda into dev-102013

Conflicts:
	app/wp-content/themes/.DS_Store