-adding obstacles
animation
Merge branch 'master' into ActionAnimations
action animation
Merge pull request #7 from TinasFu/ActionAnimations

Action animations
-Added crane, added trashcans. They scroll w/ ground, appear ever 2 seconds.
Merge branch 'master' into KoriBranch
Adding duck fucntion. Not done
Fixing merge conflict
-Fixed merge
Merge pull request #8 from Kolo13/KoriBranch

Kori branch
Merge remote-tracking branch 'upstream/master' into BrianBranch
updated and reorganized brian/kori's code
-merging from master
Merge remote-tracking branch 'upstream/master' into BrianBranch
Deleted left swipe
Merge branch 'master' into gestureBranch
Prepare for Pull
Merge branch 'master' into vincentBranch
Added logic for different contacts, stopped screen and added reset button