New SFU sighting
Merge branch 'master' of https://github.com/LJWilliams/git-project
adding file from notebook demo
testing the gui
Merge branch 'test'
finishing up before lunch
adding files from Dethe's tutorial
Merge branch 'master' of https://github.com/LJWilliams/git-project

Conflicts:
	allcaps.py
	args.py
	capit.py
	filein.py