Updated stuff

Signed-off-by: David Robinson <david@redevolution.com>
Merge branch 'master' of https://github.com/RedEvo/laughing-archer

Signed-off-by: David Robinson <david@redevolution.com>

Conflicts:
	index.html