committing to pull.
Merge branch 'kinematics' of
git@github.com:tsquared89/Design-Synthesis.git into kinematics

Conflicts:
	Design_Merging/test/test_new_kinematics.pyc