testing
changed header
no more ribbit
fixed andy's dumb mistake
commented out Hai route and added in our basic login/ui
finally merged the two directories together