Updated should be possible to control product order via the drop down select box test
added phantomjs configurations
Merge branch 'master' into e2e

getting latest tests
added phantomJS successfully!
Merge branch 'e2e'

merging phantomjs configurations
Merge pull request #1 from bsnyder/productDetailPage

Can now click a product from the list and go to the detail page
re-add /otherwise to app.js
Added *.iml files to the .gitignore file
move OPTIONS query string param out of the $Resource and  into the Controller
first protractor config
Merge branch 'master' of https://github.com/bsnyder/sushi
improve unit test coverage in the ProductListCtrl
protractor config and first test
added phantom
Merge branch 'master' into e2e

merging master into e2e
updated models in test
replace calls to $resource with the ProductsLoader
get test to pass
improvements to product detail page
fix merge conflicts