First commit
Merge branch 'master' of github.com:zqw86713/Masters.Thesis.Project.uOttawa.2012