adding first backbone view
resolving merge conflicts