created JS file
resolved merge conflict

Conflicts:
	index.html