images
Merge branch 'master' of https://github.com/tborisova/hackfmi4

Conflicts:
	images.py