Objects
Merge branch 'master' of https://github.com/mksanderson/jasabo

Conflicts:
	.DS_Store