obstacles are in

got obstacles sort of functioning, messed with a lot of files that are
about to be overwritten
stupid library files

just commiting these so i can start the dreaded merge
merged from iago

merged from iago's branch, im not seeing the conflicts i expected to so
hopefully this is up to date?
boxes and gems

got the preliminary boxes and gems in the game
fixed some bugs

got something fixed with the lives and the boxes
boxes improved

got them functioning closer to how we want, have identified some bad
bugs.