Merge pull request #5 from Gabs00/master

Added room controller and change route handler to include room