Commits for donnak

v296_base to v297_preview (2014-02-24 to 2014-03-03) v297

• Made a few edits to training annoucement at top of page.
  • src/hg/htdocs/training.html - lines changed 18, context: html, text, full: html, text
• Fixed merge conflict after making a few edits to training announcement at top of page.
  • src/hg/htdocs/training.html - lines changed 18, context: html, text, full: html, text