futzing with login routing
messing around wtih llamas
removing random font file
merge Becca's changes into master
merging llamas