some updates

yay
Merge branch 'master' of github.com:nushackers/hacknroll into gh-pages

Conflicts:
	index.html