--
Merge branch 'master' of https://github.com/Harvey-Specter/slope

Conflicts:
	note.txt
---