Joel commit 451
please let this work
Merge branch 'joel' of https://github.com/tomoueda/Umbrella.spritebuilder
not a real commit
PLEASE WORK!
Merge branch 'master' into logan4
merging to master now.
please end the pain.
a commit that finally works.