don't look at this git just wants me to commit
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	log.txt
	wrapper.py

merge stuff with David's code
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	log.txt
	wrapper.py

Actually merge stuff now