Correct Q2 program
Merge branch 'master' of https://github.com/chaseliu/Systems-Engineering-Spring-2014-Cyan