image folder
Merge branch 'master' of https://github.com/CMBmaseda/asbury

Conflicts:
	asbury_images