to do

Wont let me discard
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/To do_2.docx