reset
huh
Merge branch 'master' of https://github.com/dope/west

Conflicts:
	.DS_Store