Updates
Merge branch 'master' of https://github.com/n1ck3/newz-www

Conflicts:
	index.html