sign up and user settings page css modified
unused files deleted
unused imaged deleted
unused files deleted
edit.html.erb conflicts managed