Merge pull request #33 from OSN64/nig-devs

Nig devs
E=MC2 TROOPER
Pushing as requested...
Merge branch 'master' of https://github.com/osn64/rollingpin
Final Boss Showdown! Charizard i choose you!
Game Over - You Win!
fixed search
Fixed small bug.
Merge branch 'master' of https://github.com/OSN64/rollingpin into nig-devs
merge