Two updates in one day!

Hey there!

Thanks to AxelKong, I ended up merging the two versions of the game into a new one and made the code much leaner! Also managed to cut about 100mb from the game's size, which is pretty awesome! 

Enjoy!