wiki update
Merge branch 'master' of github.com:nodiscc/nodezero

Conflicts:
	wiki/Applications.md