Combine everything
Merge branch 'master' of github.com:Thachnh/cs283final