setting up test environments
Delete bower.json
testing merge error failure
environment
updated environment
updated environment
fixing merge errors
added a controller and delt with more merge errors
First test passes " search results and term should be empty"