Merge pull request #53 from mentatzoe/master

Fixed the merging issues!
Merge pull request #55 from mentatzoe/master

Tweaking intro
Update on sprite

Nothing too serious.