soldate update
Merge branch 'master' of http://www.github.com/eelfroth/BGS_LudumDare29
Merge branch 'master' of http://www.github.com/eelfroth/BGS_LudumDare29