test
Merge remote-tracking branch 'origin/master'
getting grammar
Merge remote-tracking branch 'origin/master'
pre-fetch
trying again
Can now write sentences with conjugated verbs, write blocks of free
verse made up of those sentences.
Merging Grace's poetry writing.
Grace's Poetry writing
Merge branch 'master' of https://github.com/CSUDallas/DS12013.git

Conflicts:
	Moby/bin/dsmoby/DSGraph.class
	Moby/bin/dsmoby/DSLinkedList.class
	Moby/bin/dsmoby/GraceGrammar.class
	Moby/bin/dsmoby/GraphTester.class
	Moby/bin/dsmoby/Moby.class
	Moby/bin/dsmoby/MobyWord.class
	Moby/bin/dsmoby/Poet.class
	Moby/bin/latina/DSBinaryTree.class
	Moby/bin/latina/DSLinkedList.class
	Moby/bin/latina/Dactyl.class
	Moby/bin/latina/LatinPoet.class
	Moby/bin/latina/ServumVerbi.class
	Moby/bin/latina/Terminus.class
	Moby/bin/latina/Verbum.class
	Moby/src/dsmoby/Moby.java
	Moby/src/dsmoby/MobyWord.java
	Moby/src/dsmoby/Poet.java