first commit

here to write the notes regarding this work
add a blank line
add three more lines
don't know
second?
third
red
bold
Merge branch 'presentation'

Conflicts:
	script.py
new
Merge branch 'master' of github.com:JadeYu/wildphoto