Merge pull request #34 from duiker2/master

Fix disconnected room glitch
Added custom buttons.
Merge branch 'master' of https://github.com/elvap/Rougue into elvap-master

Conflicts:
	Assets/Artwork.meta
	Assets/Artwork/Fonts.meta
	Assets/Artwork/Fonts/game_over.ttf
	Assets/Artwork/Fonts/game_over.ttf.meta
	Assets/Artwork/Main_Menu.meta
	Assets/Artwork/Main_Menu/MainMenu.png
	Assets/Artwork/Main_Menu/MainMenu.png.meta
	Assets/Fonts.meta
	Assets/Other_Artwork.meta
	Assets/Other_Artwork/Main_Menu.meta
	Assets/Other_Artwork/Main_Menu/MainMenu.png
	Assets/Other_Artwork/Main_Menu/MainMenu.png.meta
	Assets/Resources.meta
	Assets/Resources/Artwork.meta
	Assets/Resources/Artwork/Main_Menu.meta
	Assets/Resources/Artwork/Main_Menu/MainMenu.png
	Assets/Resources/Artwork/Main_Menu/MainMenu.png.meta
	ProjectSettings/TagManager.asset
Merge branch 'master' of https://github.com/Birdbrain2/Rougue into elvap-master
Merge pull request #36 from duiker2/elvap-master

Added custom buttons from elvap's request
Fixed warning involving spawning enemies