starting merge
Updated all but proj.cpp
merged