tmp
Merge branch 'master' of https://github.com/ToddCostella/Java-One-2013

Conflicts:
	Chickens Dolphins.key
Removed a lot of the general part and updated my (the xmpp) approach related slides.