add swim input/output
merge
Merge branch 'tao' into sprint7

Conflicts:
	kabam/kabam_output.py
Merge branch 'jon' into sprint7