Made refactoring changes to existing code
Merge branch 'master' of https://github.com/ttabbara/311-Project