Conflicts:
	src/js/main.js
lol