My Update
Fixed indent on greetings
Merge branch 'MLeung14-master'
Merge branch 'master' of https://github.com/NoahLevine/Hello-World into NoahLevine-master

Conflicts:
	HelloWorld.java
Merge branch 'NoahLevine-master'
Adding Clare's greeting
Merge branch 'clareliguori-master'
Add Clint + Aloha
Merge pull request #9 from cpsandbox/master

Add Clint + Aloha
Update HelloWorld.java
Merge pull request #11 from Jamessovick/patch-2

Update HelloWorld.java
Update HelloWorld.java

Fixes:
added comma to fix compile error
removed redundancies in the import statements

Additions:
added more statements to the name list and to the greet list
Merge pull request #12 from Overwatch301/master

Update HelloWorld.java
mdalton getting the homework done...adding my name and greeting string
Fixing the spacing in my change
Update HelloWorld.java

Added an additional greeting
Merge pull request #14 from BenDeVries/patch-1

Update HelloWorld.java
Merge branch 'master' of https://github.com/Spartronics4915/Hello-World into mdalton-spartonics-master

Conflicts:
	HelloWorld.java
Merge branch 'mdalton-spartonics-master'
Update HelloWorld.java