bad commit
Revert #30
Moved files around and deleted useless ones
junk
Merged With ygong10's Animations and Minimap
Merge pull request #33 from duiker2/master

Merged with ygong10's Animations and Minimap
Fixed disconnected room glitch

accidently broke it at the hackathon
reformat
Merge branch 'master' of https://github.com/Birdbrain2/Rougue
Merge pull request #34 from duiker2/master

Fix disconnected room glitch
scene change
Fixed down & left animation glitch
Added custom buttons.
Organized folders

scenes organized into the teams that created them, and all assets
organized into 4 folders: Artwork, Scenes, Scripts, and Characters
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
Added Art and Enemy Animations
Added settings functionality and quit button.
Merge pull request #37 from elvap/master

Added settings functionality and quit button.