Added output tp q5.cpp
Merge branch 'lab12'
Merge branch 'master' of github.com:2unco/info3220