Added ms3
Merge branch 'master' of git://github.com/jamesjlee/CS4720