Template changes
Merge branch 'master' of https://github.com/brisbert/brisbert

# By Ryan Hodge (2) and Jason Richards (1)
# Via Ryan Hodge (2) and Jason Richards (1)
* 'master' of https://github.com/brisbert/brisbert:
  Updated picqld database with subject data
  Integrated bert speaks with the webapp. Basic test on home page.
  Fixed bug where get_by_id was not working correctly

Conflicts:
	webapp/webapp/templates/home/home.jinja2