merging MainController.java
Pulling latest edits
Merge branch 'master' of github.com:Tadimsky/vooga
Merge branch 'master' of github.com:Tadimsky/vooga
merging GameController.java
Merge branch 'master' of github.com:Tadimsky/vooga
Merge branch 'master' of github.com:Tadimsky/vooga
Merging with loading/menu commits
changed the location of the image files under resources
revamped the loading controller display
added a Text.properties file for customizable naming
revamped the menu controller display
minor changes in MainController to reflect changes in Menu and Loading controller
added screenbutton.java for use in menucontroller
updated mainmenu to support screenbutton.java
Menu now supports start game functionality in menucontroller
updating data file structure of resources to include sprite and background folders. Makes it more organized
Merge branch 'master' of github.com:Tadimsky/vooga