boo
Merge branch 'master' of github.com:sociam/zooniverse-history
t

Conflicts:
	zooniverse-history.log
got rid of superfluous file