remove console.log
Merge branch 'master' into task/add_drop

Conflicts:
	src/main.js