velocity phase 0
Merge branch 'velocity'

Conflicts:
	Fred/Fred.cs