second commit of ALL THE THINGS!
blah
Merge branch 'master' of https://github.com/dabrady/workspace

Conflicts:
	srwaggon_caffeine/phoenix/entity/Entity.class

asdf