starting merge
Updated all but proj.cpp
merged
Merge pull request #5 from camdonite/merge

Merge