new file but good changes
Merge branch 'master' of https://github.com/bmalla/explore

Conflicts:
	issue