Track changes from Laptop

Overwritten index, added javascript events + bootstrap css & js
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	style.css