Initializing repo and committing homework 7 so I can work from home and school.

Initial commit

Changes to be committed:
	new file:   .classpath
	new file:   .project
	new file:   bin/Anemone.class
	new file:   bin/CreatureInfo.class
	new file:   bin/OceanFrame$1.class
	new file:   bin/OceanFrame$2.class
	new file:   bin/OceanFrame$3.class
	new file:   bin/OceanFrame$4.class
	new file:   bin/OceanFrame$5.class
	new file:   bin/OceanFrame$6.class
	new file:   bin/OceanFrame$7.class
	new file:   bin/OceanFrame.class
	new file:   bin/OceanMain.class
	new file:   bin/OceanModel$1.class
	new file:   bin/OceanModel$Info.class
	new file:   bin/OceanModel$PrivateData.class
	new file:   bin/OceanModel.class
	new file:   bin/OceanPanel.class
	new file:   bin/SeaCreature$Action.class
	new file:   bin/SeaCreature$Direction.class
	new file:   bin/SeaCreature$Neighbor.class
	new file:   bin/SeaCreature.class
	new file:   src/Anemone.java
	new file:   src/CreatureInfo.java
	new file:   src/OceanFrame.java
	new file:   src/OceanMain.java
	new file:   src/OceanModel.java
	new file:   src/OceanPanel.java
	new file:   src/SeaCreature.java
Started to implement Anemone class. Unfinished.

Changes to be committed:
	modified:   bin/Anemone.class
	modified:   src/Anemone.java
Merge https://github.com/tristanplaysguitar/oceansimulator

Conflicts:
	bin/Anemone.class
	bin/OceanMain.class
	src/Anemone.java
	src/OceanMain.java

It looks like you may be committing a merge.
If this is not correct, please remove the file
	.git/MERGE_HEAD
and try again.

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch master
All conflicts fixed but you are still merging.

Changes to be committed:
	new file:   bin/.gitignore
	modified:   src/Anemone.java
	new file:   src/Crab.java
	modified:   src/OceanMain.java
Finally got Anemone and crab working. Compiles and runs as it should.

On branch master
Changes to be committed:
	modified:   bin/Anemone.class
	modified:   bin/OceanMain.class
	modified:   src/Anemone.java
	modified:   src/Crab.java
	modified:   src/OceanMain.java