ASCL additions from past weekend's meeting between Alice and Peter
this should pretty much wrap up most of what we added to ASCL
Merge branch 'master' of https://github.com/astro-friedel/ADASS

Conflicts:
	part7/Friedel_P12/Friedel_P12.tex
testing if we're good