Fixed

This time
Merge branch 'master' of https://github.com/mrdirby/fauxnet

Conflicts:
	index.html
Merge branch 'master' of https://github.com/mrdirby/fauxnet