pulled updated code
added color to butons and new sign up route
fixed redirect
fixed merge issue