Making changes. EVERYWHERE.

Beep!
Trying to fix things Help
Merge branch 'master' of https://github.com/WhiteHusky/Bunny

Conflicts:
	Main_game_folder/main.lua