update
Merge branch 'master' of https://github.com/coaxcode/notes

Conflicts:
	opensuse-13.1_notes.txt