Sortable Placeholder Fix
Merge branch 'master' of https://github.com/casesandberg/hella

Conflicts:
	.DS_Store
	js/script.js