Merge remote-tracking branch 'origin/suboptimal-parameter' into tracer_model
Merge branch 'tracer_model' of https://github.com/sandialabs/slycat into tracer_model
Added initial loading bar
Added resize to loading screen

Refactor to move all calculation logic into a separate function
Changed play image to something slightly better
Reworking to support only getting data once

Completed a few TODO tags related to condensing function calls as well
Merge branch 'tracer_model' of https://github.com/sandialabs/slycat into tracer_model
Fixed svg edge detection for image frames
Use squares instead of circles. The idea is that squares render faster as they are less complex than circles
Merge branch 'tracer_model' of https://github.com/sandialabs/slycat into tracer_model
Fix scaling square position
Push movie down one pixel and move the frame down an extra 2 so that there is no overlap
Fixed crash after loading data problem
Merge branch 'tracer_model' of ssh://github.com/sandialabs/slycat into tracer_model

Conflicts:
	web-server/js/tracer-image/movie.js
Removed debug statement
Merge branch 'master' of ssh://github.com/sandialabs/slycat into tracer_model