more
Merge branch 'master' of http://github.com/serog/bitstarter

Conflicts:
	index.html