controller test funtional, failing
functional passing controller test
Merge branch 'master' into new_search
merge commit
copied old js
functional Jasmine skeleton
two successful jasmine tests
merge commit
Merge pull request #12 from red-admirals-2014/new_search2

New search2