Merging changes
Adding GTest and GMock to project
Cleaning up Project files, setting output and intermediate directories