implemented merge project with tests, also fixed failing build_options t...

Implemented `merge` as a method of `class Project`. 
Created test for merging projects with both jobs and files. 

Fixed `test_build_options`. This test was previously failing.