Merge branch 'master' of github.com:WPN-XM/website-wpn-xm.org

Conflicts:
	index.html
Merge branch 'master' of github.com:WPN-XM/website-wpn-xm.org