log things
main works now!
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	ir_log.txt
	log.txt

merge