Conflicts:
	index.js
fixing conflicts i guess