.DS_Store banished!
Merge branch 'master' of https://github.com/montanaj/SweetLife

Conflicts:
	.DS_Store