small changes
merged vector class into main.cpp