dolphin dependencies
Merge branch 'master' of
git@github.com:dennyisrael/hackathon_chat_client.git

Conflicts:
	marie.baerschen/pom.xml