initial commit
Merge branch 'master' of github.com:ethan-c-/slideshow
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   slideshow.py
add logging
Merge branch 'master' of github.com:ethan-c-/slideshow

Conflicts:
	write_config.py
add write_config.py to .gitignore