Lunch time break.
right number of terms in gal reps
Merge branch 'master' of https://github.com/mjd95/lmfdb into mine

* 'master' of https://github.com/mjd95/lmfdb:
  New interface for tensor product page
  add deg1 case
  Tensor power coeffs, to be used when neither degree is 1
  Added friends to tensor products of ell curves and dirichlet characters
  Add Hodge structure functionality
Added init function for Artin reps.
Add lfunction method to gal reps
Corrected some mistakes
Merge branch 'master' of https://github.com/MarkWatkins2014/lmfdb into mine

* 'master' of https://github.com/MarkWatkins2014/lmfdb:
  Add general tensor_get_an()
merge with ber2
small chanes to artin reps
some work on tensor products
Merge branch 'master' of https://github.com/mjd95/lmfdb into mine

* 'master' of https://github.com/mjd95/lmfdb:
  Updated interface for tensor products
  root_number_at_oo (as mod 4 result)
some progress
Typed the function for modular forms minus epsilon. Needs checking
start the day with coffee
Merge branch 'master' of https://github.com/MarkWatkins2014/lmfdb into mine

* 'master' of https://github.com/MarkWatkins2014/lmfdb:
  move testing line to end
  change naming conventions, add get_euler_factor utility
  Remove useless line
Merge branch 'mine' of http://github.com/categorie/lmfdb into minealberto

Conflicts:
	lmfdb/tensor_products/galois_reps.py
quick fix for problems in gal_reps
Finished implementing the thingy for Elliptic Modular Forms
local euler factors added to gal reps
Merge branch 'mine' of https://github.com/categorie/lmfdb into minealberto

Conflicts:
	lmfdb/tensor_products/galois_reps.py