dtw
Merge branch 'master' of https://github.com/KinectGod/KinectFYP

Conflicts:
	TaiChiLearning/MainWindow.xaml.cs