Started golden Retriever. can't continue until models are recieved.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Copious Dogs/Copious Dogs/com/gitHub/copiousDogs/CopiousDogs.java
	Copious Dogs/Copious
Dogs/com/gitHub/copiousDogs/client/ClientProxy.java