Fixed score up and 1up fading text notifier.
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand

Conflicts:
	Twist/src/com/secondhand/model/entity/BlackHole.java
Debugging some.
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.