Images (working)
Merge branch 'master' of https://github.com/james-hester/Elevator

Conflicts:
	.DS_Store