New SFU sighting
Merge branch 'master' of https://github.com/LJWilliams/git-project
iPython Notebook for Strings, Floats, Integers and Simple Arithmatic for SFU Bootcamp June 7, 2013
adding file from notebook demo
testing the gui
Merge branch 'test'
finishing up before lunch
adding files from Dethe's tutorial
dethe's scripts for using python from the shell
one more of dethe's scripts
Merge branch 'master' of https://github.com/LJWilliams/git-project

Conflicts:
	allcaps.py
	args.py
	capit.py
	filein.py
Adding notebook from Friday
Merge branch 'master' of https://github.com/LJWilliams/git-project
Etherpad from SFU Software Carpentry Bootcamp June 6-7 2013
Merge branch 'master' of https://github.com/LJWilliams/git-project
Merge branch 'master' of https://github.com/LJWilliams/git-project
adding remaining files