update
Merge branch 'master' of https://github.com/nunull/school

Conflicts:
	cisco-13-2.md