adding stuff
resolved conflicts

Conflicts:
	index.html