simple modification
Merge branch 'master' of http://github.com/barbariantiger/bitstarter

Conflicts:
	index.html

	new file:   bio2.jpg
	new file:   bio3.jpg
	new file:   bio7.jpg
	modified:   index.html
	modified:   web.js