merge fixed
Merge branch 'master' of https://github.com/davidzou/Wondering

Conflicts:
	raspberry/usage/proxy_repositories_nexus.md