update
Merge branch 'master' of https://github.com/mfleming7024/ASL

Conflicts:
	.DS_Store