Updated main.cpp
Merge branch 'master' of https://github.com/kdod/254proj