ignore
fixed readme!
Merge branch 'master' of https://github.com/piantado/kelpy

Conflicts:
	kelpy/DotStimulus.py~
	kelpy/ImageClickResponse.py~