moAR BEWTSTWRAP
Merge branch 'master' of github.com:wyne/log

Conflicts:
	admin.html