conflict fix
Merge branch 'master' of https://github.com/countsnap/sandl

Conflicts:
	.DS_Store