updates
Merge branch 'master' of github.com:ctSkennerton/scriptShed

Conflicts:
	calculate_ani.py