Updated main.cpp for new object encapsulation.
Merge branch 'master' of github.com:finger563/CS283Project