changed images controller
Merge branch 'master' of https://github.com/thinkpad20/synesthesia

Conflicts:
	.DS_Store