Merge branch 'master' of github.com:cmusv-sc/ArchF2013-Project4-PT