Update

Code cleaned up
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/bg.JPG
	index.html
	tools/style.css