modified:   lap_tracker/lap_tracking.py
Merge branch 'master' of github.com:bnoi/lap_tracker

Conflicts:
	lap_tracker/lap_tracking.py
Lots of code refactory for the matrices
still a bug in gap closing but merge and split seem to work
so it's still a work in progress
Ok doesn't look so bad
Added blender scripts for 3D rendering

new file:   blender_render/blender_render/__init__.py
new file:   blender_render/blender_render/main.py
new file:   blender_render/blender_render/objects.py
new file:   blender_render/blender_render/utils.py
new file:   blender_render/cell.blend
new file:   blender_render/track.h5
modified:   lap_tracker/lap_tracking.py
modified:   lap_tracker/lap_cost_matrix.py
modified:   lap_tracker/lap_tracking.py
modified:   lap_tracker/tester.py
Fixed bug with index.set_names() instead of index.names =
	modified:   lap_tracker/lap_tracking.py
	modified:   lap_tracker/lap_tracking.py
Merge branch 'master' of github.com:glyg/lap_tracker
added split merge test
some refactoring
still not optimum
	modified:   lap_tracker/lap_cost_matrix.py
	modified:   lap_tracker/lap_tracking.py
Correcting birth and death cost computaiont
Correcting alternate cost computation
	modified:   lap_cost_matrix.py
	modified:   lap_tracking.py
	modified:   tester.py
correct cost computation
Non crashing version, still have to work on aternate cost computation
added some sugar (relabeling from zero and better color management)
typos
removed extra pyc file