Merge branch 'master' of github.com:joelwass/dumpster into joelTest
merging to fix segue
Merge branch 'workingLogan' of github.com:joelwass/dumpster into joelTest
fixing
stuff
t message to explain why this merge is necessary,
update on animation
Merge branch 'joelTest' of https://github.com/joelwass/dumpster into daena

Conflicts:
	Dumpster.xcodeproj/project.pbxproj