Merge branch 'CG' of https://github.com/CGTheLegend/CMPS121_Spring2014_FinalProject into CG

Conflicts:
Battleship/AndroidManifest.xml
Battleship/bin/AndroidManifest.xml
Battleship/bin/Battleship.apk
Battleship/bin/R.txt
Battleship/bin/classes.dex
Battleship/bin/classes/android/support/v7/appcompat/R$drawable.class
Battleship/bin/classes/android/support/v7/appcompat/R$id.class
Battleship/bin/classes/android/support/v7/appcompat/R$integer.class
Battleship/bin/classes/android/support/v7/appcompat/R$layout.class
Battleship/bin/classes/android/support/v7/appcompat/R$string.class
Battleship/bin/classes/android/support/v7/appcompat/R$style.class
Battleship/bin/classes/android/support/v7/appcompat/R$styleable.class
Battleship/bin/classes/com/example/battleship/MainActivity$1.class
Battleship/bin/classes/com/example/battleship/MainActivity$2.class
Battleship/bin/classes/com/example/battleship/MainActivity$Graph.class
Battleship/bin/classes/com/example/battleship/MainActivity$Node.class
Battleship/bin/classes/com/example/battleship/MainActivity$aView.class
Battleship/bin/classes/com/example/battleship/MainActivity$bView.class
Battleship/bin/classes/com/example/battleship/MainActivity.class
Battleship/bin/classes/com/example/battleship/R$drawable.class
Battleship/bin/classes/com/example/battleship/R$id.class
Battleship/bin/classes/com/example/battleship/R$integer.class
Battleship/bin/classes/com/example/battleship/R$layout.class
Battleship/bin/classes/com/example/battleship/R$menu.class
Battleship/bin/classes/com/example/battleship/R$string.class
Battleship/bin/classes/com/example/battleship/R$style.class
Battleship/bin/classes/com/example/battleship/R$styleable.class
Battleship/bin/jarlist.cache
Battleship/bin/resources.ap_
Battleship/gen/android/support/v7/appcompat/R.java
Battleship/gen/com/example/battleship/R.java
Battleship/src/com/example/battleship/MainActivity.java
Trying to delete.