No more DS Store files pls
Merge branch 'master' of github.com:TeaWithStrangers/tws-on-rails

Conflicts:
	.DS_Store
	app/.DS_Store