commit before i make a new class to break up the super large browse abstraction
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project