moved rock.cpp to correct location
Merged code

Basic game now works.