play version upgrade and dependency on selenium firefox driver
non-changes
Updates from project reorg
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy
Updates to fix a null pointer exception with a test.
conclude merge
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy
Removed unnecessary semi-colons
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy

Conflicts:
  functional/src/test/scala/specs/JeopardyFunctional.scala
  project/Dependencies.scala

Formatting changes to eliminate tab characters in .scala files and reformat source
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy

Conflicts:
  functional/src/test/scala/specs/EndToEnd.scala
Formatting changes
Merge branch 'master' of github.com:ColumbusScalaEnthusiasts/Jeopardy

Conflicts:
  functional/src/test/scala/specs/EndToEnd.scala
Formatting changes