Merge remote-tracking branch 'origin/master'

2019-03-11 19:07:26 -06:00
parent 923ff50c87 8c776b769b
commit 29e0f3e683
2 changed files with 21 additions and 14 deletions
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -12,7 +12,7 @@ import javafx.stage.Stage;

 /**
 * 2019-03-10
- * Authors: Harkamal, Vikram, Haris, Siddhant, Nathan
+ * Authors: Haris Muhammad
 * ShipWarfareGUI class, Generates and utilizes ships which the user can attack or run from
 *
 */