getting rid of ds
Merge branch 'master' of https://github.com/stevepofd/yolo-octo-archer

Conflicts:
	.DS_Store
	assets/.DS_Store