Adding simple admin page
putting express back in
Merge remote-tracking branch 'origin/master' into chat

Conflicts:
	index.js