even moaer conflacts

swg
Merge branch 'master' of https://github.com/XepherX/HelloWorldJS

Conflicts:
	index.html