updating my branch with master
updating my branch with master
State manager is almost polished and done
state manager is cleaner, working, all in one scene and gtg
Added state manager to firstlevel001.
removed states from main scene
may have stuffed up a merge pretty hard. who knows? not me.
 fix merge