Added ask and answer frontend
fix conflicts