added astroidsGame.java file
resolved conflicts