prettier login by a bit
tracking history works
Merge branch 'master' of github.com:dyep49/alex into development
logout bar, cleaned user contoller, user dash
Merge branch 'master' of github.com:dyep49/alex into new_zoo